Merge branch 'cwd-fixes' of https://github.com/Kimundi/cargo

diff --cc src/bin/bench.rs
Simple merge

diff --cc src/bin/build.rs
Simple merge

diff --cc src/bin/clean.rs
Simple merge

diff --cc src/bin/doc.rs
Simple merge

diff --cc src/bin/run.rs
Simple merge

diff --cc src/bin/rustc.rs
Simple merge

diff --cc src/bin/test.rs
Simple merge

diff --cc src/cargo/ops/cargo_new.rs
Simple merge

diff --cc tests/test_cargo_bench.rs
Simple merge

diff --cc tests/test_cargo_compile_git_deps.rs
Simple merge

diff --cc tests/test_cargo_install.rs
Simple merge

diff --cc tests/test_cargo_package.rs
Simple merge

diff --cc tests/test_cargo_registry.rs
Simple merge

diff --cc tests/test_cargo_test.rs
Simple merge

diff --cc tests/tests.rs
Simple merge